Remove BABL_HARD_MAX_PATH_LENGTH from here, it's only for internal use.

* babl/babl.h:
* babl/babl-internal.h: Remove BABL_HARD_MAX_PATH_LENGTH from
here, it's only for internal use.

* babl/babl-fish-path.c: #define BABL_HARD_MAX_PATH_LENGTH locally
here.

svn path=/trunk/; revision=361

diff --git a/ChangeLog b/ChangeLog
index b526a9dbb74fb513b3828f43e5a9be8ae3b2bf5b..83a7637ab24bc04aaf4cbce7c7c8f7243cefd0ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-01-14  Martin Nordholts  <martinn@svn.gnome.org>
+
+       * babl/babl.h:
+       * babl/babl-internal.h: Remove BABL_HARD_MAX_PATH_LENGTH from
+       here, it's only for internal use.
+
+       * babl/babl-fish-path.c: #define BABL_HARD_MAX_PATH_LENGTH locally
+       here.
+
 2009-01-14  Martin Nordholts  <martinn@svn.gnome.org>
 
        * babl/babl.h (BABL_ALPHA_THRESHOLD): Instead of an arbitrary

diff --git a/babl/babl-fish-path.c b/babl/babl-fish-path.c
index ea6b1ffb34a57d9a826ad4c8b8930d12cd6a070b..038aaaa7e29f724fbf43db40c6adeef455d8892a 100644 (file)
--- a/babl/babl-fish-path.c
+++ b/babl/babl-fish-path.c
@@ -19,8 +19,9 @@
 #include <math.h>
 #include "babl-internal.h"
 
-#define BABL_LEGAL_ERROR    0.000001
-#define BABL_MAX_COST_VALUE 2000000
+#define BABL_LEGAL_ERROR           0.000001
+#define BABL_MAX_COST_VALUE        2000000
+#define BABL_HARD_MAX_PATH_LENGTH  8
 
 static void
 init_path_instrumentation (Babl *fmt_source,

diff --git a/babl/babl-internal.h b/babl/babl-internal.h
index 661ac9eb9abf4e8e219089e8f454213994e9f8d9..4a3422a30266cfcc0555d86ba45241f0c5904216 100644 (file)
--- a/babl/babl-internal.h
+++ b/babl/babl-internal.h
@@ -24,7 +24,6 @@
 #endif
 
 #define BABL_MAX_COMPONENTS       32
-#define BABL_HARD_MAX_PATH_LENGTH  8
 #define BABL_CONVERSIONS           5
 
 #include <stdlib.h>

diff --git a/babl/babl.h b/babl/babl.h
index 1788d2f457e9192822f5fcd8192eae29450d14c6..f55d4d16b39772c871d7b423d4403d972b1019f8 100644 (file)
--- a/babl/babl.h
+++ b/babl/babl.h
@@ -35,10 +35,6 @@ typedef union _Babl Babl;
 
 typedef struct _BablList BablList;
 
-#ifndef BABL_HARD_MAX_PATH_LENGTH
-#define BABL_HARD_MAX_PATH_LENGTH 16
-#endif
-
 /* magic number used at the start of all babl objects, used to do
  * differentiation in polymorphic functions. (as well as manual
  * type check assertions).